(read_char_x_menu_prompt, read_char_minibuf_menu_prompt):

(read_char_x_menu_prompt, read_char_minibuf_menu_prompt):
New functions made by dividing up read_char_menu_prompt.
(read_char): Call read_char_minibuffer_menu_prompt before the sit_for
if X menus are not going to be used.
(read_char_minibuf_menu_prompt): Correct access to keymaps for
menus when not using X menus.  Only store character read in a keyboard
macro if it is not the menu help character.